124. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

124.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlsidebar_sticky.phtml2021-02-04 10:09:02 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlsidebar_sticky.phtml2021-06-12 07:57:14 +0000

124.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged426
Changed218
Inserted00
Removed159

124.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

124.4 Active regular expressions

No regular expressions were active.

124.5 Comparison detail

1 <?php 1 <?php
2     $sidebar_sticky = $this->getConfig('porto_settings/general/sidebar_sticky'); 2     $sidebar_sticky = $this->getConfig('porto_settings/general/sidebar_sticky');
3 ?> 3 ?>
4 <?php if($sidebar_sticky): ?> 4 <?php if($sidebar_sticky): ?>
5 <script type="text/javascript"> 5 <script type="text/javascript">
6 require([ 6 require([
7     'jquery'
 7     'jquery',
    8     'themeSticky'
8 ], function ($) { 9 ], function ($) {
9     if(!$("body").hasClass("page-layout-1column") && !$("body").hasClass("account")) { 10   if(!$("body").hasClass("page-layout-1column") && !$("body").hasClass("account")) {
10         $(".sidebar-main").css("position","relative"); 11     $(".sidebar.sidebar-main .sidebar-content").themeSticky({
11         var main_area_pos; 12       autoInit: true,
12         var main_area_height = $(".column.main").outerHeight(); 13       minWidth: 992,
13         var left_side_top = 0; 14       containerSelector: '.page-main .columns',
14         var right_side_top = 0; 15       autoFit: true,
15         var cur_Y = pre_Y = 0; 16       paddingOffsetBottom: 10,
16         $(document).ready(function(){ 17       paddingOffsetTop: 60
17             setTimeout(function(){stickySidebar();},1000);    
18         }); 18     });
19         $(window).scroll(function(){    
20             stickySidebar();    
21         });    
22         $(window).resize(function(){    
23             left_side_top = 0;    
24             stickySidebar();    
25         });    
26         function stickySidebar(){    
27             if($(".column.main").offset()) {    
28                 main_area_pos = $(".column.main").offset().top;    
29             }    
30             main_area_height = $(".column.main").outerHeight();    
31             margin_top = $(".page-header").hasClass("sticky-header")?60:10;    
32             margin_bottom = 10;    
33             var fixedSideTop = fixedSideBottom = fixedSideTop_r = fixedSideBottom_r = 0;    
34             cur_Y = $(window).scrollTop();    
35             if($(".sidebar-main").outerHeight() < main_area_height) {    
36                 if($(window).height() < $(".sidebar-main").outerHeight() + margin_top + margin_bottom) {    
37                     if(main_area_pos >= cur_Y + margin_top) {    
38                         left_side_top = 0;    
39                     } else if(cur_Y >= main_area_pos + main_area_height - $(window).height()) {    
40                         left_side_top = main_area_height - $(".sidebar-main").outerHeight();    
41                     } else {    
42                         if ( cur_Y > pre_Y ) {    
43                             if(fixedSideTop) {    
44                                 fixedSideTop = 0;    
45                                 left_side_top = $(".sidebar-main").offset().top - main_area_pos;    
46                             } else if(!fixedSideBottom && $(".sidebar-main").outerHeight() + $(".sidebar-main").offset().top < cur_Y + $(window).height()) {    
47                                 fixedSideBottom = 1;    
48                                 left_side_top = cur_Y - (main_area_pos + $(".sidebar-main").outerHeight() - $(window).height()) - 10    
49                             }    
50                         } else {    
51                             if(fixedSideBottom) {    
52                                 fixedSideBottom = 0;    
53                                 left_side_top = cur_Y - main_area_pos - $(".sidebar-main").outerHeight() + $(window).height() - 10;    
54                             } else if(!fixedSideTop && $(".sidebar-main").offset().top >= cur_Y + margin_top) {    
55                                 fixedSideTop = 1;    
56                                 left_side_top = cur_Y - main_area_pos + margin_top;    
57                             }    
58     
59                         }    
60                     }    
61                 } else {    
62                     if ( cur_Y >= ( main_area_pos - margin_top ) && cur_Y + $(".sidebar-main").outerHeight() + margin_top < main_area_pos + main_area_height) {    
63                         left_side_top = cur_Y - main_area_pos + margin_top;    
64                     } else if(cur_Y + $(".sidebar-main").outerHeight() + margin_top > main_area_pos + main_area_height) {    
65                         left_side_top = main_area_height - $(".sidebar-main").outerHeight();    
66                     } else {    
67                         left_side_top = 0;    
68                     }    
69     
70                     fixedSideTop = fixedSideBottom = 0;    
71                 }    
72                 $(".sidebar-main").css("top",left_side_top + "px");    
73             } else {    
74                 $(".sidebar-main").css("top",0);    
75             }    
76             pre_Y = cur_Y;    
77         }    
78     } 19   }
79 }); 20 });
80 </script> 21 </script>
81 <?php endif; ?> 22 <?php endif; ?>